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

Merge branch '2.0' into 2.1

Browse Source
This commit is contained in:
Markus Mäkelä
2017-02-20 11:17:49 +02:00
parent f54c0a5b81 f7cc548093
commit 61f2d96a58
7 changed files with 139 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
avro/maxavro_file.c
View File

@ -12,6 +12,7 @@
*/
#include "maxavro.h"
#include "skygw_utils.h"
#include <errno.h>
#include <string.h>
#include <maxscale/log_manager.h>
@ -49,11 +50,12 @@ bool maxavro_verify_block(MAXAVRO_FILE *file)
int rc = fread(sync, 1, SYNC_MARKER_SIZE, file->file);
if (rc != SYNC_MARKER_SIZE)
{
if (rc == -1)
if (ferror(file->file))
{
MXS_ERROR("Failed to read file: %d %s", errno, strerror(errno));
char err[STRERROR_BUFLEN];
MXS_ERROR("Failed to read file: %d %s", errno, strerror_r(errno, err, sizeof(err)));
}
else
else if (rc > 0 || !feof(file->file))
{
MXS_ERROR("Short read when reading sync marker. Read %d bytes instead of %d",
rc, SYNC_MARKER_SIZE);

24
avro/maxavro_record.c
View File

@ -49,9 +49,11 @@ static json_t* read_and_pack_value(MAXAVRO_FILE *file, MAXAVRO_SCHEMA_FIELD *fie
case MAXAVRO_TYPE_LONG:
{
uint64_t val = 0;
maxavro_read_integer(file, &val);
json_int_t jsonint = val;
value = json_pack("I", jsonint);
if (maxavro_read_integer(file, &val))
{
json_int_t jsonint = val;
value = json_pack("I", jsonint);
}
}
break;
@ -74,11 +76,23 @@ static json_t* read_and_pack_value(MAXAVRO_FILE *file, MAXAVRO_SCHEMA_FIELD *fie
break;
case MAXAVRO_TYPE_FLOAT:
{
float f = 0;
if (maxavro_read_float(file, &f))
{
double d = f;
value = json_pack("f", d);
}
}
break;
case MAXAVRO_TYPE_DOUBLE:
{
double d = 0;
maxavro_read_double(file, &d);
value = json_pack("f", d);
if (maxavro_read_double(file, &d))
{
value = json_pack("f", d);
}
}
break;