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

Treat empty avro filenames as an error

Browse Source 
If an empty filename is requested, treat it as an error.
This commit is contained in:
Markus Mäkelä
2019-06-26 09:10:04 +03:00
parent 01822490ca
commit d45915c279
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
server/modules/routing/avrorouter/avro_client.cc
View File

@ -279,17 +279,20 @@ std::pair<std::string, std::string> get_avrofile_and_gtid(std::string file)
auto first_dot = filename.find_first_of('.'); auto first_dot = filename.find_first_of('.');
auto last_dot = filename.find_last_of('.'); auto last_dot = filename.find_last_of('.');
if (first_dot != std::string::npos if (!file.empty())
&& last_dot != std::string::npos
&& first_dot != last_dot)
{ {
// Exact file version specified e.g. test.t1.000002 if (first_dot != std::string::npos
filename += ".avro"; && last_dot != std::string::npos
} && first_dot != last_dot)
else {
{ // Exact file version specified e.g. test.t1.000002
// No version specified, send first file filename += ".avro";
filename += ".000001.avro"; }
else
{
// No version specified, send first file
filename += ".000001.avro";
}
} }
return std::make_pair(filename, gtid); return std::make_pair(filename, gtid);
@ -329,13 +332,17 @@ void AvroSession::process_command(GWBUF* queue)
avro_binfile = file_and_gtid.first; avro_binfile = file_and_gtid.first;
if (file_in_dir(router->avrodir.c_str(), avro_binfile.c_str())) if (avro_binfile.empty())
{ {
queue_client_callback(); dcb_printf(dcb, "ERR NO-FILE Filename not specified.\n");
}
else if (!file_in_dir(router->avrodir.c_str(), avro_binfile.c_str()))
{
dcb_printf(dcb, "ERR NO-FILE File '%s' not found.\n", avro_binfile.c_str());
} }
else else
{ {
dcb_printf(dcb, "ERR NO-FILE File '%s' not found.\n", avro_binfile.c_str()); queue_client_callback();
} }
} }
else else
@ -714,6 +721,7 @@ void AvroSession::client_callback()
/** Stream the data to the client */ /** Stream the data to the client */
bool read_more = stream_data(); bool read_more = stream_data();
mxb_assert(!avro_binfile.empty() && strstr(avro_binfile.c_str(), ".avro"));
std::string filename = get_next_filename(avro_binfile, router->avrodir); std::string filename = get_next_filename(avro_binfile, router->avrodir);
bool next_file; bool next_file;