Commit c4fcc190 authored by Greg Williams's avatar Greg Williams
Browse files

Merged in implementation of KineticClient_GetKeyRange, but still need to... 

Merged in implementation of KineticClient_GetKeyRange, but still need to complete system test and validation.
parents 560b6a97 02da0989

.gitmodules

+0 −3
Original line number Diff line number Diff line
@@ -14,6 +14,3 @@ 
	path = vendor/zlog

	url = https://github.com/zma/zlog.git

	branch = master
 
[submodule "vendor/kinetic-java"]

	path = vendor/kinetic-java

	url = https://github.com/Seagate/kinetic-java.git

Makefile

+15 −8
Original line number Diff line number Diff line
@@ -48,14 +48,6 @@ ci: uninstall all install 
	@echo $(PROJECT) v$(VERSION) is in working order

	@echo



test: Rakefile $(LIB_OBJS)

	@echo

	@echo --------------------------------------------------------------------------------

	@echo Testing $(PROJECT)

	@echo --------------------------------------------------------------------------------

	bundle install

	bundle exec rake test_all



clean:

	bundle exec rake clobber

	rm -rf $(BIN_DIR)/* $(OUT_DIR)/*.o *.core
@@ -98,6 +90,21 @@ $(OUT_DIR)/kinetic_client.o: $(LIB_DIR)/kinetic_client.c $(LIB_DEPS) 
	$(CC) -c -o $@ $< $(CFLAGS) $(LIB_INCS)





#-------------------------------------------------------------------------------

# Test Support

#-------------------------------------------------------------------------------



test: Rakefile $(LIB_OBJS)

	@echo

	@echo --------------------------------------------------------------------------------

	@echo Testing $(PROJECT)

	@echo --------------------------------------------------------------------------------

	bundle install

	bundle exec rake test_all



JAVA_HOME ?= /usr

JAVA_BIN = $(JAVA_HOME)/bin/java





#-------------------------------------------------------------------------------

# Static and Dynamic Library Build Support

include/kinetic_client.h

+1 −1
Original line number Diff line number Diff line
@@ -119,6 +119,6 @@ KineticStatus KineticClient_Delete(KineticSessionHandle handle, 
 *                      upon failure

 */

KineticStatus KineticClient_GetKeyRange(KineticSessionHandle handle,

                                        KineticKeyRange* range, ByteBuffer* keys[], int max_keys);

                                        KineticKeyRange* range, ByteBuffer keys[], int max_keys);



#endif // _KINETIC_CLIENT_H

include/kinetic_types.h

+2 −1
Original line number Diff line number Diff line
@@ -40,9 +40,10 @@ 
#define KINETIC_TLS_PORT        (8443)

#define KINETIC_HMAC_SHA1_LEN   (SHA_DIGEST_LENGTH)

#define KINETIC_HMAC_MAX_LEN    (KINETIC_HMAC_SHA1_LEN)

#define KINETIC_DEFAULT_KEY_LEN (1024)

#define KINETIC_MAX_KEY_LEN     (4096)

#define KINETIC_MAX_VERSION_LEN (256)

#define PDU_VALUE_MAX_LEN       (1024 * 1024)

#define KINETIC_OBJ_SIZE        (1024 * 1024)



// Define max host name length

// Some Linux environments require this, although not all, but it's benign.

src/lib/byte_array.c

+4 −0
Original line number Diff line number Diff line 
#include "byte_array.h"

#include <assert.h>

#include <string.h>

#include <stdio.h>



ByteArray ByteArray_Create(void* data, size_t len)

{
@@ -79,10 +80,13 @@ ByteBuffer* ByteBuffer_Append(ByteBuffer* buffer, const void* data, size_t len) 
    assert(buffer->array.data != NULL);

    assert(data != NULL);

    if (len == 0 || ((buffer->bytesUsed + len) > buffer->array.len)) {

        // printf("Invalid parameters for buffer copy!\n");

        return NULL;

    }

    memcpy(&buffer->array.data[buffer->bytesUsed], data, len);

    buffer->bytesUsed += len;

    // printf("Appended data!\n")

    assert(buffer != NULL);

    return buffer;

}