mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-04-23 07:05:36 +03:00
792aea2a7c
This is a fix of logging subsystem, nothing else. The old code expanded an argument into string and advanced too little and, if expansion contained argument's index, it expanded it again. And again.
104 lines
2.8 KiB
C++
104 lines
2.8 KiB
C++
/*
|
|
Copyright (c) 2021 MariaDB Corporation
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License
|
|
as published by the Free Software Foundation; version 2 of
|
|
the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
|
MA 02110-1301, USA.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <boost/any.hpp>
|
|
#include <cstdint>
|
|
#include <regex>
|
|
#include <stdexcept>
|
|
#include <string>
|
|
|
|
namespace logging
|
|
{
|
|
template <class T, class Iter>
|
|
void formatOne(std::string& errMsg, Iter iter, uint32_t position)
|
|
{
|
|
T arg = boost::any_cast<T>(*iter);
|
|
std::string token = std::string("%") + std::to_string(position) + std::string("%");
|
|
size_t index = 0;
|
|
|
|
while (true)
|
|
{
|
|
index = errMsg.find(token, index);
|
|
if (index == std::string::npos)
|
|
break;
|
|
|
|
size_t advance_length;
|
|
|
|
// below we can replace token with longer or shorter string.
|
|
// we should compute exact replacement length to prevent
|
|
// 1) recognizing token inside a replacement
|
|
// 2) not skipping token recognition if replacement is shorter.i
|
|
// regarding 1: the string is "%1%" and replacement is "aaaaa %1%".
|
|
// regarding 2: the string is "%1% %1%" and replacement is empty string.
|
|
|
|
if constexpr (std::is_same_v<T, std::string>)
|
|
{
|
|
advance_length = arg.length();
|
|
errMsg.replace(index, token.length(), arg);
|
|
}
|
|
else
|
|
{
|
|
advance_length = std::to_string(arg).length();
|
|
errMsg.replace(index, token.length(), std::to_string(arg));
|
|
}
|
|
|
|
index += advance_length;
|
|
}
|
|
}
|
|
|
|
template <class T>
|
|
void formatMany(std::string& errMsg, const T& args)
|
|
{
|
|
auto iter = args.begin();
|
|
auto end = args.end();
|
|
uint32_t position = 1;
|
|
|
|
while (iter != end)
|
|
{
|
|
if (iter->type() == typeid(long))
|
|
{
|
|
formatOne<long>(errMsg, iter, position);
|
|
}
|
|
else if (iter->type() == typeid(uint64_t))
|
|
{
|
|
formatOne<uint64_t>(errMsg, iter, position);
|
|
}
|
|
else if (iter->type() == typeid(double))
|
|
{
|
|
formatOne<double>(errMsg, iter, position);
|
|
}
|
|
else if (iter->type() == typeid(std::string))
|
|
{
|
|
formatOne<std::string>(errMsg, iter, position);
|
|
}
|
|
else
|
|
{
|
|
throw std::logic_error("logggin::format: unexpected type in argslist");
|
|
}
|
|
++iter;
|
|
++position;
|
|
}
|
|
static std::regex restToken("%[0-9]%");
|
|
errMsg = std::regex_replace(errMsg, restToken, "");
|
|
}
|
|
|
|
} // namespace logging
|