Commit b30c7718 authored by Paul Lensing's avatar Paul Lensing
Browse files

Initial 3.0.0 compability changes.

parent 83eb785f

src/command_line_flags.h

+2 −4
Original line number Diff line number Diff line
@@ -45,14 +45,12 @@ bool parse_flags(int *argc, 
    options.hmac_key = FLAGS_hmac_key;



    kinetic::KineticConnectionFactory kinetic_connection_factory = kinetic::NewKineticConnectionFactory();



    if (!kinetic_connection_factory.NewNonblockingConnection(options, nonblocking_connection).ok()) {

    if (!kinetic_connection_factory.NewNonblockingConnection(options, nonblocking_connection).ok() ||

        !kinetic_connection_factory.NewBlockingConnection(options, blocking_connection, FLAGS_timeout).ok() ){

        printf("Unable to connect\n");

        return false;

    }

    blocking_connection = std::make_shared<kinetic::BlockingKineticConnection>(nonblocking_connection, FLAGS_timeout);

    blocking_connection->SetClientClusterVersion(FLAGS_cluster_version);



    return true;

}

src/delete_file_nonblocking.cc

+3 −3
Original line number Diff line number Diff line
@@ -75,12 +75,12 @@ int main(int argc, char* argv[]) { 
    KineticConnectionFactory kinetic_connection_factory = kinetic::NewKineticConnectionFactory();



    shared_ptr<kinetic::NonblockingKineticConnection> nonblocking_connection;

    if (!kinetic_connection_factory.NewNonblockingConnection(options, nonblocking_connection).ok()) {

    shared_ptr<kinetic::BlockingKineticConnection> blocking_connection;

    if (!kinetic_connection_factory.NewNonblockingConnection(options, nonblocking_connection).ok() ||

        !kinetic_connection_factory.NewBlockingConnection(options, blocking_connection, 10).ok() ){

        printf("Unable to connect\n");

        return 1;

    }

    shared_ptr<kinetic::BlockingKineticConnection> blocking_connection =

            make_shared<kinetic::BlockingKineticConnection>(nonblocking_connection, 5);



    std::unique_ptr<KineticRecord> record;

    if(!blocking_connection->Get(string(kinetic_key), record).ok()) {

src/read_file_nonblocking.cc

+3 −4
Original line number Diff line number Diff line
@@ -88,14 +88,13 @@ int main(int argc, char* argv[]) { 
    KineticConnectionFactory kinetic_connection_factory = kinetic::NewKineticConnectionFactory();



    shared_ptr<kinetic::NonblockingKineticConnection> nonblocking_connection;

    if (!kinetic_connection_factory.NewNonblockingConnection(options, nonblocking_connection).ok()) {

    shared_ptr<kinetic::BlockingKineticConnection> blocking_connection;

    if (!kinetic_connection_factory.NewNonblockingConnection(options, nonblocking_connection).ok() ||

        !kinetic_connection_factory.NewBlockingConnection(options, blocking_connection, 5).ok() ){

        printf("Unable to connect\n");

        return 1;

    }



    shared_ptr<kinetic::BlockingKineticConnection> blocking_connection =

            make_shared<kinetic::BlockingKineticConnection>(nonblocking_connection, 5);



    std::unique_ptr<KineticRecord> record;

    if(!blocking_connection->Get(kinetic_key, record).ok()) {

        printf("Unable to get metadata\n");

src/write_file_blocking.cc

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


#include "kinetic/kinetic.h"



using com::seagate::kinetic::client::proto::Message_Algorithm_SHA1;

using com::seagate::kinetic::client::proto::Command_Algorithm_SHA1;

using kinetic::Status;

using kinetic::KineticRecord;
@@ -71,7 +71,7 @@ int example_main( 
                key,

                "",

                kinetic::WriteMode::IGNORE_VERSION,

                KineticRecord(value, "", "", Message_Algorithm_SHA1),

                KineticRecord(value, "", "", Command_Algorithm_SHA1),

                kinetic::PersistMode::WRITE_BACK).ok()) {

            printf("Unable to write a chunk\n");

            return 1;
@@ -87,7 +87,7 @@ int example_main( 
            FLAGS_kinetic_key,

            "",

            kinetic::WriteMode::IGNORE_VERSION,

            KineticRecord(to_string(inputfile_stat.st_size), "", "", Message_Algorithm_SHA1),

            KineticRecord(to_string(inputfile_stat.st_size), "", "", Command_Algorithm_SHA1),

            kinetic::PersistMode::FLUSH).ok()) {

        printf("Unable to write metadata\n");

        return 1;

src/write_file_blocking_threads.cc

+7 −7
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ 


#include "kinetic/kinetic.h"



using com::seagate::kinetic::client::proto::Message_Algorithm_SHA1;

using com::seagate::kinetic::client::proto::Command_Algorithm_SHA1;

using kinetic::KineticConnectionFactory;

using kinetic::BlockingKineticConnection;

using kinetic::ThreadsafeBlockingKineticConnection;

using kinetic::Status;

using kinetic::KineticStatus;

using kinetic::KineticRecord;
@@ -51,7 +51,7 @@ using std::vector; 
using std::thread;



void put_range(int64_t start, int64_t end, int64_t total_size, const char* kinetic_key,

        const char* input_file_name, shared_ptr<kinetic::BlockingKineticConnection> blocking_connection);

        const char* input_file_name, shared_ptr<kinetic::ThreadsafeBlockingKineticConnection> blocking_connection);



int main(int argc, char* argv[]) {

    google::InitGoogleLogging(argv[0]);
@@ -73,7 +73,7 @@ int main(int argc, char* argv[]) { 


    KineticConnectionFactory kinetic_connection_factory = kinetic::NewKineticConnectionFactory();



    shared_ptr<kinetic::BlockingKineticConnection> blocking_connection;

    shared_ptr<kinetic::ThreadsafeBlockingKineticConnection> blocking_connection;

    if (!kinetic_connection_factory.NewThreadsafeBlockingConnection(options, blocking_connection, 5).ok()) {

        printf("Unable to connect\n");

        return 1;
@@ -116,7 +116,7 @@ int main(int argc, char* argv[]) { 
            kinetic_key,

            "",

            kinetic::WriteMode::IGNORE_VERSION,

            KineticRecord(std::to_string(inputfile_stat.st_size), "", "", Message_Algorithm_SHA1),

            KineticRecord(std::to_string(inputfile_stat.st_size), "", "", Command_Algorithm_SHA1),

            kinetic::PersistMode::FLUSH).ok()) {

        printf("Unable to write metadata\n");

        return 1;
@@ -132,7 +132,7 @@ int main(int argc, char* argv[]) { 
}



void put_range(int64_t start, int64_t end, int64_t total_size, const char* kinetic_key,

        const char* input_file_name, shared_ptr<kinetic::BlockingKineticConnection> blocking_connection) {

        const char* input_file_name, shared_ptr<kinetic::ThreadsafeBlockingKineticConnection> blocking_connection) {

    printf("thread writing %" PRId64 " to %" PRId64 "\n", start, end);



    int file = open(input_file_name, O_RDONLY);
@@ -156,7 +156,7 @@ void put_range(int64_t start, int64_t end, int64_t total_size, const char* kinet 
                    key,

                    "",

                    kinetic::WriteMode::IGNORE_VERSION,

                    KineticRecord(value, "", "", Message_Algorithm_SHA1),

                    KineticRecord(value, "", "", Command_Algorithm_SHA1),

                    kinetic::PersistMode::WRITE_BACK);

        if(!status.ok()) {

            printf("Unable to write chunk: %d %s\n", static_cast<int>(status.statusCode()),