Commit 973678b5 authored by Marshall Pierce's avatar Marshall Pierce
Browse files

Merge pull request #1 from Seagate/features/no-op 

Features/no op
parents 93c9ef85 c1e7636f

include/kinetic/blocking_kinetic_connection.h

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ class BlockingKineticConnection { 
    /// tells the client the correct cluster version using this method.

    virtual void SetClientClusterVersion(int64_t cluster_version);



    virtual KineticStatus NoOp();



    virtual KineticStatus Get(

            const shared_ptr<const string> key,

            unique_ptr<KineticRecord>& record);

include/kinetic/nonblocking_kinetic_connection.h

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ class NonblockingKineticConnection { 
    virtual bool Run(fd_set *read_fds, fd_set *write_fds, int *nfds);

    virtual void SetClientClusterVersion(int64_t cluster_version);



    virtual HandlerKey NoOp(const shared_ptr<SimpleCallbackInterface> callback);

    virtual HandlerKey Get(const string key, const shared_ptr<GetCallbackInterface> callback);

    virtual HandlerKey Get(const shared_ptr<const string> key,

        const shared_ptr<GetCallbackInterface> callback);

include/kinetic/threadsafe_nonblocking_connection.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ class ThreadsafeNonblockingKineticConnection : public NonblockingKineticConnecti 
    /// tells the client the correct cluster version using this method.

    void SetClientClusterVersion(int64_t cluster_version);



    HandlerKey NoOp(const shared_ptr<SimpleCallbackInterface> callback);

    HandlerKey Get(const shared_ptr<const string> key,

            const shared_ptr<GetCallbackInterface> callback);

    HandlerKey GetNext(const shared_ptr<const string> key,

src/integration_test/blocking_smoketest.cc

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ using com::seagate::kinetic::client::proto::Message_Algorithm_SHA1; 
TEST_F(IntegrationTest, BlockingSmoketest) {

    BlockingKineticConnection& blocking = connection_->blocking();



    ASSERT_TRUE(blocking.NoOp().ok());



    auto record1 = make_shared<KineticRecord>(make_shared<string>("value1"),

        make_shared<string>("v1"), make_shared<string>("t1"), Message_Algorithm_CRC32);

    KineticStatus kineticStatus = blocking.Put("key1", "", IGNORE_VERSION, *record1);

src/main/blocking_kinetic_connection.cc

+18 −13
Original line number Diff line number Diff line
@@ -67,6 +67,24 @@ class BlockingCallbackState { 
    }

};



class SimpleCallback : public SimpleCallbackInterface, public BlockingCallbackState {

    public:

    virtual void Success() {

        OnSuccess();

    }



    virtual void Failure(KineticStatus error) {

        OnError(error);

    }



    private:

};



KineticStatus BlockingKineticConnection::NoOp() {

    auto handler = make_shared<SimpleCallback>();

    return RunOperation(handler, nonblocking_connection_->NoOp(handler));

}



class BlockingGetCallback : public GetCallbackInterface, public BlockingCallbackState {

    public:

    BlockingGetCallback(
@@ -187,19 +205,6 @@ KineticStatus BlockingKineticConnection::Put(const string& key, 
        make_shared<KineticRecord>(record));

}



class SimpleCallback : public SimpleCallbackInterface, public BlockingCallbackState {

    public:

    virtual void Success() {

        OnSuccess();

    }



    virtual void Failure(KineticStatus error) {

        OnError(error);

    }



    private:

};



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

    const shared_ptr<const string> version, WriteMode mode) {

    auto callback = make_shared<SimpleCallback>();