1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00

[MCOL-5106] Add support to work with StorageManager.

This patch eliminates boost::filesystem from `mcsRebuildEM` tool.
After this change we should be able to work with any filesystem
even S3.
This commit is contained in:
Denis Khalikov
2022-05-30 20:15:46 +03:00
parent de522ed15a
commit fb1e23bb83
5 changed files with 154 additions and 89 deletions

View File

@ -18,7 +18,6 @@
#include <iostream>
#include <string>
#include <ftw.h>
#include <boost/filesystem.hpp>
#include <boost/algorithm/string/case_conv.hpp>
#include "configcpp.h"
@ -29,7 +28,7 @@
using namespace idbdatafile;
using namespace RebuildExtentMap;
static void usage(const string& pname)
static void usage(const std::string& pname)
{
std::cout << "usage: " << pname << " [-vdhs]" << std::endl;
std::cout << "rebuilds the extent map from the contents of the database file "
@ -41,6 +40,20 @@ static void usage(const string& pname)
std::cout << " -s show extent map and quit" << std::endl;
}
static bool isYes()
{
std::string confirmation;
std::cin >> confirmation;
if (confirmation.size() == 0)
return false;
boost::algorithm::to_lower(confirmation);
if (!(confirmation == "y" || confirmation == "yes"))
return false;
return true;
}
int main(int argc, char** argv)
{
int32_t option;
@ -78,41 +91,28 @@ int main(int argc, char** argv)
// MCOL-4685
std::cout << "The launch of mcsRebuildEM tool must be sanctioned by MariaDB support. " << std::endl;
std::cout << "Requirement: all DBRoots must be on this node. " << std::endl;
std::cout << "Do you want to continue Y/N? ";
std::string confirmation;
cin >> confirmation;
if (confirmation.size() == 0)
return 0;
boost::algorithm::to_lower(confirmation);
if (!(confirmation == "y" || confirmation == "yes"))
if (!isYes())
return 0;
auto* config = config::Config::makeConfig();
// Check for storage type.
const auto DBRootStorageType = config->getConfig("Installation", "DBRootStorageType");
if (DBRootStorageType != "internal")
{
std::cout << "Only internal DBRootStorageType is supported, provided: " << DBRootStorageType << std::endl;
return 0;
}
const auto BRMSavesEM = config->getConfig("SystemConfig", "DBRMRoot") + "_em";
// Check for `BRM_saves_em` file presents.
// TODO: Should we add force option to remove file?
if (boost::filesystem::exists(BRMSavesEM))
if (IDBPolicy::exists(BRMSavesEM.c_str()))
{
std::cout << BRMSavesEM << " file exists. " << std::endl;
std::cout << "Please note: this tool is only suitable in situations "
"where there is no `BRM_saves_em` file. "
<< std::endl;
std::cout << "If `BRM_saves_em` "
"exists extent map will be restored from it. "
<< std::endl;
std::cout << "Exiting. " << std::endl;
return 0;
std::cout << "Do you want to delete this file Y/N? ";
if (!isYes())
return 0;
if (IDBPolicy::remove(BRMSavesEM.c_str()) == -1)
{
std::cout << "Cannot remove " << BRMSavesEM << std::endl;
std::cout << "Exiting. " << std::endl;
return 0;
}
}
// Initialize system extents from the binary blob.
@ -136,10 +136,11 @@ int main(int argc, char** argv)
auto dbRootPath = config->getConfig("SystemConfig", dbRootName);
emReBuilder.setDBRoot(dbRootNumber);
emReBuilder.collectExtents(dbRootPath.c_str());
emReBuilder.rebuildExtentMap();
emReBuilder.clear();
}
emReBuilder.rebuildExtentMap();
emReBuilder.clear();
// Save restored extent map.
emReBuilder.getEM().save(BRMSavesEM);
std::cout << "Completed." << std::endl;