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

Always read Avro headers from file

Browse Source 
The headers were read from memory as if they were in compressed
format. This mistake was caused by the fact that the function names were
changed.
This commit is contained in:
Markus Mäkelä
2017-04-09 14:59:23 +03:00
parent 9a221c46f3
commit b0bec7b9b8
1 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
avro/maxavro.c
View File

@ -159,6 +159,47 @@ char* maxavro_read_string(MAXAVRO_FILE* file, size_t* size)
return key; return key;
} }
/**
* @brief Read an Avro string
*
* The strings are encoded as one Avro integer followed by that many bytes of
* data.
* @param file File to read from
* @return Pointer to newly allocated string or NULL if an error occurred
*
* @see maxavro_get_error
*/
char* maxavro_read_string_from_file(MAXAVRO_FILE* file, size_t* size)
{
char *key = NULL;
uint64_t len;
if (maxavro_read_integer_from_file(file, &len))
{
key = MXS_MALLOC(len + 1);
if (key)
{
if (fread(key, 1, len, file->file) == len)
{
key[len] = '\0';
*size = len;
}
else
{
file->last_error = MAXAVRO_ERR_IO;
MXS_FREE(key);
key = NULL;
}
}
else
{
file->last_error = MAXAVRO_ERR_MEMORY;
}
}
return key;
}
/** /**
* @bref Skip an Avro string * @bref Skip an Avro string
* *
@ -285,7 +326,7 @@ MAXAVRO_MAP* maxavro_read_map_from_file(MAXAVRO_FILE *file)
{ {
size_t size; size_t size;
MAXAVRO_MAP* val = calloc(1, sizeof(MAXAVRO_MAP)); MAXAVRO_MAP* val = calloc(1, sizeof(MAXAVRO_MAP));
if (val && (val->key = maxavro_read_string(file, &size)) && (val->value = maxavro_read_string(file, &size))) if (val && (val->key = maxavro_read_string_from_file(file, &size)) && (val->value = maxavro_read_string_from_file(file, &size)))
{ {
val->next = rval; val->next = rval;
rval = val; rval = val;