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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Johan Wikman
2019-02-06 12:24:09 +02:00
parent 5a409f313a d8b9bcfdd9
commit b8be905b08
10 changed files with 296 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/modules/routing/avrorouter/avro_file.cc
View File

@ -652,17 +652,30 @@ void avro_load_metadata_from_schemas(Avro* router)
for (int i = files.gl_pathc - 1; i > -1; i--)
{
char* dbstart = strrchr(files.gl_pathv[i], '/');
mxb_assert(dbstart);
if (!dbstart)
{
continue;
}
dbstart++;
char* tablestart = strchr(dbstart, '.');
mxb_assert(tablestart);
if (!tablestart)
{
continue;
}
snprintf(db, sizeof(db), "%.*s", (int)(tablestart - dbstart), dbstart);
tablestart++;
char* versionstart = strchr(tablestart, '.');
mxb_assert(versionstart);
if (!versionstart)
{
continue;
}
snprintf(table, sizeof(table), "%.*s", (int)(versionstart - tablestart), tablestart);
versionstart++;