database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-10 22:42:30 +03:00
Code Activity

Add some exception handling.

Browse Source
This commit is contained in:
benthompson15
2019-08-13 16:03:27 -05:00
parent 4bfc650af1
commit 38bb62c59a
1 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/Replicator.cpp
View File

@@ -184,12 +184,43 @@ int Replicator::addJournalEntry(const boost::filesystem::path &filename, const u
{ {
// read the existing header and check if max_offset needs to be updated // read the existing header and check if max_offset needs to be updated
size_t tmp; size_t tmp;
boost::shared_array<char> headertxt = seekToEndOfHeader1(fd, &tmp); boost::shared_array<char> headertxt;
try
{
headertxt = seekToEndOfHeader1(fd, &tmp);
}
catch (std::runtime_error& e)
{
mpLogger->log(LOG_CRIT,"%s",e.what());
errno = EIO;
return -1;
}
catch (...)
{
mpLogger->log(LOG_CRIT,"Unknown exception caught during seekToEndOfHeader1.");
errno = EIO;
return -1;
}
stringstream ss; stringstream ss;
ss << headertxt.get(); ss << headertxt.get();
headerRollback = headertxt.get(); headerRollback = headertxt.get();
boost::property_tree::ptree header; boost::property_tree::ptree header;
boost::property_tree::json_parser::read_json(ss, header); try
{
boost::property_tree::json_parser::read_json(ss, header);
}
catch (const boost::property_tree::json_parser::json_parser_error& e)
{
mpLogger->log(LOG_CRIT,"%s",e.what());
errno = EIO;
return -1;
}
catch (...)
{
mpLogger->log(LOG_CRIT,"Unknown exception caught during read_json.");
errno = EIO;
return -1;
}
assert(header.get<int>("version") == 1); assert(header.get<int>("version") == 1);
uint64_t currentMaxOffset = header.get<uint64_t>("max_offset"); uint64_t currentMaxOffset = header.get<uint64_t>("max_offset");
if (thisEntryMaxOffset > currentMaxOffset) if (thisEntryMaxOffset > currentMaxOffset)