implemented non-chaining p2p operations (7afb26bf) · Commits · kinetic-archive / kinetic-c

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ all: default test run examples
		clean: makedirs
		rm -rf ./bin/*/
		rm -f $(OUT_DIR)/.o .core *.log
		rake clobber
		bundle exec rake clobber
		git submodule update --init
		-./vendor/kinetic-simulator/stopSimulator.sh &> /dev/null;

include/byte_array.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -59,5 +59,6 @@ ByteBuffer* ByteBuffer_AppendBuffer(ByteBuffer* buffer, const ByteBuffer bufferT
		ByteBuffer* ByteBuffer_AppendCString(ByteBuffer* buffer, const char* data);
		ByteBuffer* ByteBuffer_AppendFormattedCString(ByteBuffer* buffer, const char * format, ...);
		ByteBuffer* ByteBuffer_AppendDummyData(ByteBuffer* buffer, size_t len);
		bool ByteBuffer_IsNull(ByteBuffer const buffer);

		#endif // _BYTE_ARRAY_H

include/kinetic_client.h

+28 −5

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@
		#include "kinetic_types.h"

		/**
		* Initializes the Kinetic API andcsonfigures logging destination.
		* Initializes the Kinetic API and configures logging destination.
		*
		* @param log_file (path to log file, 'stdout' to log to STDOUT, NULL to disable logging)
		* @param log_level Logging level (-1:none, 0:error, 1:info, 2:verbose, 3:full)
		@@ -173,7 +173,7 @@ KineticStatus KineticClient_Delete(KineticSessionHandle handle,
		KineticCompletionClosure* closure);

		/**
		* @brief Executes a GETKEYRANGE command to retrive a set of keys in the range
		* @brief Executes a GETKEYRANGE command to retrieve a set of keys in the range
		* specified range from the Kinetic Device
		*
		* @param handle KineticSessionHandle for a connected session
		@@ -184,7 +184,7 @@ KineticStatus KineticClient_Delete(KineticSessionHandle handle,
		* will be called upon completion.
		*
		*
		* @return Returns 0 upon succes, -1 or the Kinetic status code
		* @return Returns 0 upon success, -1 or the Kinetic status code
		* upon failure
		*/
		KineticStatus KineticClient_GetKeyRange(KineticSessionHandle handle,
		@@ -192,7 +192,7 @@ KineticStatus KineticClient_GetKeyRange(KineticSessionHandle handle,
		KineticCompletionClosure* closure);

		/**
		* @brief Executes a GETLOG command to retrive a set of keys in the range
		* @brief Executes a GETLOG command to retrieve a set of keys in the range
		* specified range from the Kinetic Device
		*
		* @param handle KineticSessionHandle for a connected session
		@@ -204,13 +204,36 @@ KineticStatus KineticClient_GetKeyRange(KineticSessionHandle handle,
		* executed in asynchronous mode, and closure callback
		* will be called upon completion.
		*
		* @return Returns 0 upon succes, -1 or the Kinetic status code
		* @return Returns 0 upon success, -1 or the Kinetic status code
		* upon failure
		*/
		KineticStatus KineticClient_GetLog(KineticSessionHandle handle,
		KineticDeviceInfo_Type type,
		KineticDeviceInfo** info,
		KineticCompletionClosure* closure);
		/**
		* @brief Executes a PEER2PEERPUSH command to retrieve a set of keys in the range
		* specified range from the Kinetic Device
		*
		* @param handle KineticSessionHandle for a connected session
		* @param p2pOp KineticP2P_Operation pointer. This pointer needs to remain
		* valid during the duration of the operation. The results of
		* P2P operation(s) will be stored in the resultStatus field of
		* this structure.
		* @param closure Optional closure. If specified, operation will be
		* executed in asynchronous mode, and closure callback
		* will be called upon completion.
		*
		* @return Returns 0 upon success, -1 or the Kinetic status code
		* upon failure. Note that P2P operations can be nested. This
		* status code pertains to the initial top-level P2P operation.
		* You'll need to check the resultStatus in the p2pOp structure
		* to check the status of the individual P2P operations.
		*/
		KineticStatus KineticClient_P2POperation(KineticSessionHandle handle,
		KineticP2P_Operation* const p2pOp,
		KineticCompletionClosure* closure);


		/**
		* @brief Executes an InstantSecureErase command to erase all data from the Kinetic device.

include/kinetic_types.h

+19 −0

Original line number	Diff line number	Diff line
		@@ -324,6 +324,25 @@ typedef struct {
		KineticDeviceInfo_Device* device;
		} KineticDeviceInfo;

		typedef struct {
		char* hostname; // pointer must remain valid until operation completes
		int32_t port;
		bool tls; // optional, defaults to false
		} KineticP2P_Peer;

		typedef struct {
		ByteBuffer key;
		ByteBuffer version; // optional (defaults to force if not specified)
		ByteBuffer newKey;
		KineticStatus resultStatus; // populated with the result of the operation
		} KineticP2P_OperationData;

		typedef struct {
		KineticP2P_Peer peer;
		size_t numOperations;
		KineticP2P_OperationData* operations; // pointer must remain valid until operations complete
		} KineticP2P_Operation;

		const char* KineticMessageType_GetName(KineticMessageType type);

		#define KINETIC_DEVICE_INFO_SCRATCH_BUF_LEN (1024 * 1024 * 4) // Will get reallocated to actual/used size post-copy

src/lib/byte_array.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -211,3 +211,8 @@ ByteBuffer* ByteBuffer_AppendDummyData(ByteBuffer* buffer, size_t len)
		buffer->bytesUsed += len;
		return buffer;
		}

		bool ByteBuffer_IsNull(ByteBuffer const buffer)
		{
		return buffer.array.data == NULL;
		}