hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2208 Compile avro as C++

Browse Source 
An unantecipated sidestep in the path of introducing a small
HTTP library to maxbase.
This commit is contained in:
Johan Wikman 2018-12-05 13:39:51 +02:00
parent f2fcf79fb2
commit 80805292ef
8 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
avro/CMakeLists.txt
View File

@ -1,13 +1,13 @@
if (AVRO_FOUND AND JANSSON_FOUND)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
add_library(maxavro maxavro.c maxavro_schema.c maxavro_record.c maxavro_file.c)
add_library(maxavro maxavro.cc maxavro_schema.cc maxavro_record.cc maxavro_file.cc)
target_link_libraries(maxavro maxscale-common ${JANSSON_LIBRARIES})
if(WITH_ASAN AND ASAN_FOUND)
target_link_libraries(maxavro ${ASAN_LIBRARIES})
endif()
add_executable(maxavrocheck maxavrocheck.c)
add_executable(maxavrocheck maxavrocheck.cc)
target_link_libraries(maxavrocheck maxavro maxscale-common)
install_executable(maxavrocheck core)
add_subdirectory(test)

8
avro/maxavro.c → avro/maxavro.cc
View File

@ -144,7 +144,7 @@ char* maxavro_read_string(MAXAVRO_FILE* file, size_t* size)
if (maxavro_read_integer(file, &len))
{
key = MXS_MALLOC(len + 1);
key = (char*)MXS_MALLOC(len + 1);
if (key)
{
memcpy(key, file->buffer_ptr, len);
@ -178,7 +178,7 @@ char* maxavro_read_string_from_file(MAXAVRO_FILE* file, size_t* size)
if (maxavro_read_integer_from_file(file, &len))
{
key = MXS_MALLOC(len + 1);
key = (char*)MXS_MALLOC(len + 1);
if (key)
{
if (fread(key, 1, len, file->file) == len)
@ -333,10 +333,10 @@ MAXAVRO_MAP* maxavro_read_map_from_file(MAXAVRO_FILE* file)
while (blocks > 0)
{
for (long i = 0; i < blocks; i++)
for (long i = 0; i < (long)blocks; i++)
{
size_t size;
MAXAVRO_MAP* val = calloc(1, sizeof(MAXAVRO_MAP));
MAXAVRO_MAP* val = (MAXAVRO_MAP*)calloc(1, sizeof(MAXAVRO_MAP));
if (val
&& (val->key =
maxavro_read_string_from_file(file,

0
avro/maxavro_datablock.c → avro/maxavro_datablock.cc
View File

12
avro/maxavro_file.c → avro/maxavro_file.cc
View File

@ -90,10 +90,10 @@ bool maxavro_verify_block(MAXAVRO_FILE* file)
static uint8_t* read_block_data(MAXAVRO_FILE* file, long deflate_size)
{
uint8_t* temp_buffer = MXS_MALLOC(deflate_size);
uint8_t* temp_buffer = (uint8_t*)MXS_MALLOC(deflate_size);
uint8_t* buffer = NULL;
if (temp_buffer && fread(temp_buffer, 1, deflate_size, file->file) == deflate_size)
if (temp_buffer && fread(temp_buffer, 1, deflate_size, file->file) == (size_t)deflate_size)
{
unsigned long inflate_size = 0;
@ -108,7 +108,7 @@ static uint8_t* read_block_data(MAXAVRO_FILE* file, long deflate_size)
case MAXAVRO_CODEC_DEFLATE:
inflate_size = deflate_size * 2;
if ((buffer = MXS_MALLOC(inflate_size)))
if ((buffer = (uint8_t*)MXS_MALLOC(inflate_size)))
{
z_stream stream;
stream.avail_in = deflate_size;
@ -124,7 +124,7 @@ static uint8_t* read_block_data(MAXAVRO_FILE* file, long deflate_size)
while ((rc = inflate(&stream, Z_FINISH)) == Z_BUF_ERROR)
{
int increment = inflate_size;
uint8_t* temp = MXS_REALLOC(buffer, inflate_size + increment);
uint8_t* temp = (uint8_t*)MXS_REALLOC(buffer, inflate_size + increment);
if (temp)
{
@ -300,7 +300,7 @@ MAXAVRO_FILE* maxavro_file_open(const char* filename)
bool error = false;
MAXAVRO_FILE* avrofile = calloc(1, sizeof(MAXAVRO_FILE));
MAXAVRO_FILE* avrofile = (MAXAVRO_FILE*)calloc(1, sizeof(MAXAVRO_FILE));
char* my_filename = strdup(filename);
if (avrofile && my_filename)
@ -419,7 +419,7 @@ GWBUF* maxavro_file_binary_header(MAXAVRO_FILE* file)
{
if ((rval = gwbuf_alloc(pos)))
{
if (fread(GWBUF_DATA(rval), 1, pos, file->file) != pos)
if (fread(GWBUF_DATA(rval), 1, pos, file->file) != (size_t)pos)
{
if (ferror(file->file))
{

6
avro/maxavro_record.c → avro/maxavro_record.cc
View File

@ -57,7 +57,7 @@ static json_t* read_and_pack_value(MAXAVRO_FILE *file, MAXAVRO_SCHEMA_FIELD *fie
uint64_t val = 0;
maxavro_read_integer(file, &val);
json_t* arr = field->extra;
json_t* arr = (json_t*)field->extra;
mxb_assert(arr);
mxb_assert(json_is_array(arr));
@ -107,7 +107,7 @@ static json_t* read_and_pack_value(MAXAVRO_FILE *file, MAXAVRO_SCHEMA_FIELD *fie
case MAXAVRO_TYPE_UNION:
{
json_t *arr = field->extra;
json_t *arr = (json_t*)field->extra;
uint64_t val = 0;
if (maxavro_read_integer(file, &val) && val < json_array_size(arr))
@ -332,7 +332,7 @@ GWBUF* maxavro_record_read_binary(MAXAVRO_FILE* file)
{
fseek(file->file, file->block_start_pos, SEEK_SET);
if (fread(GWBUF_DATA(rval), 1, data_size, file->file) == data_size)
if (fread(GWBUF_DATA(rval), 1, data_size, file->file) == (size_t)data_size)
{
memcpy(((uint8_t*) GWBUF_DATA(rval)) + data_size, file->sync, sizeof(file->sync));
maxavro_next_block(file);

28
avro/maxavro_schema.c → avro/maxavro_schema.cc
View File

@ -19,16 +19,16 @@
static const MAXAVRO_SCHEMA_FIELD types[MAXAVRO_TYPE_MAX] =
{
{"int", NULL, MAXAVRO_TYPE_INT },
{"long", NULL, MAXAVRO_TYPE_LONG },
{"float", NULL, MAXAVRO_TYPE_FLOAT },
{"double", NULL, MAXAVRO_TYPE_DOUBLE },
{"bool", NULL, MAXAVRO_TYPE_BOOL },
{"bytes", NULL, MAXAVRO_TYPE_BYTES },
{"string", NULL, MAXAVRO_TYPE_STRING },
{"enum", NULL, MAXAVRO_TYPE_ENUM },
{"null", NULL, MAXAVRO_TYPE_NULL },
{NULL, NULL, MAXAVRO_TYPE_UNKNOWN}
{(char*)"int", NULL, MAXAVRO_TYPE_INT },
{(char*)"long", NULL, MAXAVRO_TYPE_LONG },
{(char*)"float", NULL, MAXAVRO_TYPE_FLOAT },
{(char*)"double", NULL, MAXAVRO_TYPE_DOUBLE },
{(char*)"bool", NULL, MAXAVRO_TYPE_BOOL },
{(char*)"bytes", NULL, MAXAVRO_TYPE_BYTES },
{(char*)"string", NULL, MAXAVRO_TYPE_STRING },
{(char*)"enum", NULL, MAXAVRO_TYPE_ENUM },
{(char*)"null", NULL, MAXAVRO_TYPE_NULL },
{NULL, NULL, MAXAVRO_TYPE_UNKNOWN}
};
/**
* @brief Convert string to Avro value type
@ -123,7 +123,7 @@ static enum maxavro_value_type unpack_to_type(json_t* object,
*/
MAXAVRO_SCHEMA* maxavro_schema_alloc(const char* json)
{
MAXAVRO_SCHEMA* rval = malloc(sizeof(MAXAVRO_SCHEMA));
MAXAVRO_SCHEMA* rval = (MAXAVRO_SCHEMA*)malloc(sizeof(MAXAVRO_SCHEMA));
if (rval)
{
@ -138,10 +138,10 @@ MAXAVRO_SCHEMA* maxavro_schema_alloc(const char* json)
if (json_unpack(schema, "{s:o}", "fields", &field_arr) == 0)
{
size_t arr_size = json_array_size(field_arr);
rval->fields = malloc(sizeof(MAXAVRO_SCHEMA_FIELD) * arr_size);
rval->fields = (MAXAVRO_SCHEMA_FIELD*)malloc(sizeof(MAXAVRO_SCHEMA_FIELD) * arr_size);
rval->num_fields = arr_size;
for (int i = 0; i < arr_size; i++)
for (int i = 0; i < (int)arr_size; i++)
{
json_t* object = json_array_get(field_arr, i);
char* key;
@ -213,7 +213,7 @@ void maxavro_schema_free(MAXAVRO_SCHEMA* schema)
{
if (schema)
{
for (int i = 0; i < schema->num_fields; i++)
for (unsigned int i = 0; i < schema->num_fields; i++)
{
maxavro_schema_field_free(&schema->fields[i]);
}

0
avro/maxavro_write.c → avro/maxavro_write.cc
View File

2
avro/maxavrocheck.c → avro/maxavrocheck.cc
View File

@ -45,7 +45,7 @@ int check_file(const char* filename)
if (!dump)
{
printf("File sync marker: ");
for (int i = 0; i < sizeof(file->sync); i++)
for (size_t i = 0; i < sizeof(file->sync); i++)
{
printf("%hhx", file->sync[i]);
}