Got all system tests working again, which led to bug fixes in async IO buffer handling and others. (7ab856d8) · Commits · kinetic-archive / kinetic-c

config/project.yml

+8 −7

Original line number	Diff line number	Diff line
		@@ -88,13 +88,13 @@
		- -g
		- -Wall
		- -Wextra
		- -pedantic
		- -Wstrict-prototypes
		- -Wincompatible-pointer-types
		- -Werror=incompatible-pointer-types
		- -Werror=strict-prototypes
		# - -Werror=strict-prototypes
		- -Werror=implicit-function-declaration
		# - -Wincompatible-pointer-types
		# - -Werror=incompatible-pointer-types
		# - -Wcast-align
		- -pedantic
		- -D_POSIX_C_SOURCE=1
		- -D_C99_SOURCE=1
		- ${1}
		@@ -111,10 +111,11 @@
		- -Wextra
		# - -pedantic
		- -Wstrict-prototypes
		# - -Wcast-align
		- -Werror=strict-prototypes
		# - -Werror=strict-prototypes
		- -Werror=implicit-function-declaration
		- -Werror=incompatible-pointer-types
		# - -Werror=incompatible-pointer-types
		# - -Wincompatible-pointer-types
		# - -Wcast-align
		- -D_POSIX_C_SOURCE=1
		- -D_C99_SOURCE=1
		- -Wno-nonnull

include/kinetic_client.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ KineticStatus KineticClient_Delete(KineticSessionHandle handle,
		* upon failure
		*/
		KineticStatus KineticClient_GetKeyRange(KineticSessionHandle handle,
		KineticKeyRange* range, ByteBufferArray keys,
		KineticKeyRange* range, ByteBufferArray* keys,
		KineticCompletionClosure* closure);

		#endif // _KINETIC_CLIENT_H

src/lib/kinetic_client.c

+18 −35

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@
		#include "kinetic_allocator.h"
		#include "kinetic_logger.h"
		#include <stdlib.h>
		#include <sys/time.h>

		static KineticStatus KineticClient_CreateOperation(
		KineticOperation** operation,
		@@ -61,7 +62,6 @@ static KineticStatus KineticClient_CreateOperation(

		static KineticStatus KineticClient_ExecuteOperation(KineticOperation* operation)
		{
		LOG0("THERE");
		KineticStatus status = KINETIC_STATUS_INVALID;

		LOGF1("Executing operation: 0x%llX", operation);
		@@ -140,9 +140,7 @@ KineticStatus KineticClient_Connect(const KineticSession* config,
		}

		// Wait for initial unsolicited status to be received in order to obtain connectionID
		while(connection->connectionID == 0) {
		sleep(1);
		}
		while(connection->connectionID == 0) {sleep(1);}

		return status;
		}
		@@ -161,9 +159,7 @@ KineticStatus KineticClient_Disconnect(KineticSessionHandle* const handle)

		// Disconnect
		KineticStatus status = KineticConnection_Disconnect(connection);
		if (status != KINETIC_STATUS_SUCCESS) {
		LOG0("Disconnection failed!");
		}
		if (status != KINETIC_STATUS_SUCCESS) {LOG0("Disconnection failed!");}
		KineticConnection_FreeConnection(handle);
		*handle = KINETIC_HANDLE_INVALID;

		@@ -174,11 +170,8 @@ KineticStatus KineticClient_NoOp(KineticSessionHandle handle)
		{
		KineticStatus status;
		KineticOperation* operation;

		status = KineticClient_CreateOperation(&operation, handle);
		if (status != KINETIC_STATUS_SUCCESS) {
		return status;
		}
		if (status != KINETIC_STATUS_SUCCESS) {return status;}

		// Initialize request
		KineticOperation_BuildNoop(operation);
		@@ -193,19 +186,16 @@ KineticStatus KineticClient_Put(KineticSessionHandle handle,
		KineticEntry* const entry,
		KineticCompletionClosure* closure)
		{
		assert(entry != NULL);
		assert(entry->value.array.data != NULL);
		KineticStatus status;
		KineticOperation* operation;

		status = KineticClient_CreateOperation(&operation, handle);
		if (status != KINETIC_STATUS_SUCCESS) {
		return status;
		}
		if (status != KINETIC_STATUS_SUCCESS) {return status;}

		// Initialize request
		KineticOperation_BuildPut(operation, entry);
		if (closure != NULL){
		operation->closure = *closure;
		}
		if (closure != NULL) {operation->closure = *closure;}

		// Execute the operation
		return KineticClient_ExecuteOperation(operation);
		@@ -216,17 +206,11 @@ KineticStatus KineticClient_Get(KineticSessionHandle handle,
		KineticCompletionClosure* closure)
		{
		assert(entry != NULL);
		if (!entry->metadataOnly) {
		assert(entry->value.array.data != NULL);
		}

		if (!entry->metadataOnly) {assert(entry->value.array.data != NULL);}
		KineticStatus status;
		KineticOperation* operation;

		status = KineticClient_CreateOperation(&operation, handle);
		if (status != KINETIC_STATUS_SUCCESS) {
		return status;
		}
		if (status != KINETIC_STATUS_SUCCESS) {return status;}

		// Initialize request
		KineticOperation_BuildGet(operation, entry);
		@@ -240,17 +224,15 @@ KineticStatus KineticClient_Delete(KineticSessionHandle handle,
		KineticEntry* const entry,
		KineticCompletionClosure* closure)
		{
		assert(entry != NULL);
		KineticStatus status;
		KineticOperation* operation;

		status = KineticClient_CreateOperation(&operation, handle);
		if (status != KINETIC_STATUS_SUCCESS) {
		return status;
		}
		if (status != KINETIC_STATUS_SUCCESS) {return status;}

		// Initialize request
		KineticOperation_BuildDelete(operation, entry);
		operation->closure = *closure;
		if (closure != NULL) {operation->closure = *closure;}

		// Execute the operation
		return KineticClient_ExecuteOperation(operation);
		@@ -258,13 +240,14 @@ KineticStatus KineticClient_Delete(KineticSessionHandle handle,

		KineticStatus KineticClient_GetKeyRange(KineticSessionHandle handle,
		KineticKeyRange* range,
		ByteBufferArray keys,
		ByteBufferArray* keys,
		KineticCompletionClosure* closure)
		{
		assert(handle != KINETIC_HANDLE_INVALID);
		assert(range != NULL);
		assert(keys.buffers != NULL);
		assert(keys.count > 0);
		assert(keys != NULL);
		assert(keys->buffers != NULL);
		assert(keys->count > 0);

		KineticStatus status;
		KineticOperation* operation;
		@@ -276,7 +259,7 @@ KineticStatus KineticClient_GetKeyRange(KineticSessionHandle handle,

		// Initialize request
		KineticOperation_BuildGetKeyRange(operation, range, keys);
		operation->closure = *closure;
		if (closure != NULL) {operation->closure = *closure;}

		// Execute the operation
		return KineticClient_ExecuteOperation(operation);

src/lib/kinetic_operation.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -362,9 +362,11 @@ KineticStatus KineticOperation_GetKeyRangeCallback(KineticOperation* operation)
		{
		assert(operation != NULL);
		assert(operation->connection != NULL);

		LOG_LOCATION; LOGF3("GETKEYRANGE callback w/ operation (0x%0llX) on connection (0x%0llX)",
		operation, operation->connection);
		assert(operation->buffers.count > 0);
		assert(operation->buffers != NULL);
		assert(operation->buffers->count > 0);

		// Report the key list upon success
		KineticProto_Command_Range* keyRange = KineticPDU_GetKeyRange(operation->response);
		@@ -377,13 +379,14 @@ KineticStatus KineticOperation_GetKeyRangeCallback(KineticOperation* operation)
		}

		void KineticOperation_BuildGetKeyRange(KineticOperation* const operation,
		KineticKeyRange* range, ByteBufferArray buffers)
		KineticKeyRange* range, ByteBufferArray* buffers)
		{
		assert(operation != NULL);
		assert(operation->connection != NULL);
		KineticOperation_ValidateOperation(operation);
		KineticConnection_IncrementSequence(operation->connection);
		assert(range != NULL);
		assert(buffers != NULL);

		operation->request->command->header->messageType = KINETIC_PROTO_COMMAND_MESSAGE_TYPE_GETKEYRANGE;
		operation->request->command->header->has_messageType = true;

src/lib/kinetic_operation.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,6 +38,6 @@ void KineticOperation_BuildDelete(KineticOperation* const operation,
		KineticEntry* const entry);

		void KineticOperation_BuildGetKeyRange(KineticOperation* const operation,
		KineticKeyRange* range, ByteBufferArray buffers);
		KineticKeyRange* range, ByteBufferArray* buffers);

		#endif // _KINETIC_OPERATION_H