Commit cb634a9c authored by Marshall Pierce's avatar Marshall Pierce
Browse files

Follow C++ client api changes

parent 8f90a409

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ else(USE_LOCAL_KINETIC_CLIENT) 
        kinetic_cpp_client

        PREFIX "vendor"

        GIT_REPOSITORY "git@github.com:Seagate/Kinetic-C-Client.git"

        GIT_TAG "41a699b7e4c64e323ef23f5141ecd261f05fed91"

        GIT_TAG "d1fffdd7fa648955a9c09008975c2b6e387be4ed"

        BUILD_IN_SOURCE 1

        INSTALL_COMMAND ""

    )

src/delete_file_blocking.cc

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
using com::seagate::kinetic::proto::Message_Algorithm_SHA1;

using kinetic::KineticConnectionFactory;

using kinetic::KineticRecord;

using kinetic::NonblockingError;

using kinetic::SimpleCallbackInterface;

using kinetic::Status;

src/delete_file_nonblocking.cc

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


using kinetic::KineticConnectionFactory;

using kinetic::KineticRecord;

using kinetic::NonblockingError;

using kinetic::StatusCode;

using kinetic::SimpleCallbackInterface;

using kinetic::Status;
@@ -25,7 +25,7 @@ public: 
        (*remaining_)--;

    }



    void Failure(NonblockingError error) {

    void Failure(StatusCode error) {

        printf("Error!\n");

        exit(1);

    }

src/read_file_nonblocking.cc

+4 −3
Original line number Diff line number Diff line
@@ -12,14 +12,15 @@ 
using kinetic::KineticConnectionFactory;

using kinetic::Status;

using kinetic::KineticRecord;

using kinetic::NonblockingError ;

using kinetic::ConnectionOptions;

using kinetic::GetCallbackInterface;

using kinetic::NonblockingKineticConnection;

using kinetic::StatusCode;



using std::shared_ptr;

using std::vector;

using std::unique_ptr;

using std::string;



class Callback : public GetCallbackInterface {

public:
@@ -34,7 +35,7 @@ public: 
        fflush(stdout);

        (*remaining_)--;

    }

    void Failure(NonblockingError error) {

    void Failure(StatusCode error) {

        printf("Error!\n");

        exit(1);

    }
@@ -114,7 +115,7 @@ int main(int argc, char* argv[]) { 
        sprintf(key_buffer, "%s-%10" PRId64, kinetic_key, i);

        remaining++;

        shared_ptr<Callback> callback(new Callback(output_buffer + i, block_length, &remaining));

        connection->nonblocking().Get(std::string(key_buffer), callback);

        connection->nonblocking().Get(string(key_buffer), callback);

        connection->nonblocking().Run(&read_fds, &write_fds, &num_fds);

        callbacks.push_back(std::move(callback));

    }

src/write_file_blocking.cc

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ using kinetic::KineticRecord; 


using std::make_shared;

using std::unique_ptr;

using std::to_string;



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

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

            "",

            kinetic::IGNORE_VERSION,

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

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

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

        return 1;

    }